Resort file structure to match javascript