change file structure, fix specs