Various improvements; JS additions
Improved overall directory structure