Initial Commit
Class refactoring