Re-organized project structure. Was getting messy :D