Project Skeleton (minor revision)

Done some minor restructuring