Starting refactoring and organizing the code