Follow JS file naming convention
Remove diverged/duplicate file
Follow CSS file naming convention