Organized project a bit