Start refactoring

Moving attributes into classes