Followed michaniskin's suggestions and moved js files to inc files in src.