merged classes into 1 file and named better
merged into single js file