cleaning up file organization, JS concatenation