Huge refactoring commit

Change directory structure
Change headers structure