Tidied up the file structure, commented out db hooks