Reestructuring folders
Fixing some inconsistencies that prevented headers to 'compile'