bug fixes, cleaned js, new folder structure