Fixed dir structure and added polymaps