Refactoring tasks & file hierarchy