Continuing reorganizing codebase