Renamed js files and prepped for different folder structure