Fixes
Restructured directories to provide a separate script dir