Commit #1

Global Refactoring