restructured folders and concatenate js