Changed file names to better organization
Better organization from JS