Some fixes
Exceptions refactored
Minor fixes
Folder structure cleanup