CHanged project structure to remove unnecessary project clutter