Moved to base package
Removed unnecessary files
Minor changes
Added proguard rules
Cleaned up a bit