Some small changes and added js folder again