Removed includes, moving to only one main folder