Fixed file structure and small tweaks.