Refactored and moved files.