Re-organized the project folder, added database