Bug fix & organise imports
Add warning for future
Cleanup & fix
NPE fix
Cleanup
Re-organise package & cleanup