Directory structure problems resolved and added missing files after ashalya's commit