the only problem that I found with it so far is that it gives a database locked error on login,
the rest seems to work fine but more testing is required.

Start of the refactoring. Commit is quite big because I forgot to use git right from the beginning. Sorry.