Simplify filenames and add /modules folder