Re-organized methods
Removed accidentally added .class files