Move the files into subdirectories
Fix require paths