Applied numix style plus some directory structure changes