Some fixes
Change directory structure