Restructure js and test folders