Clean workspace, start to refactor