Fixed all issues and moved the classes to proper package