Some major refactoring and code organization