Initial Commit
Refactoring