New directory layout
Fixed bugs and made some tweaks.
Update for 1.6.2