Organized project layout. Added more folders/updated source paths