Refactoring

Normal refactoring for project organization.