Moved to folders and added database stuff