cleaned up, removed some legacy folders and removed includes, as it was unnecessary