Initial commit
Removed unused/unnecessary classes