Some files moved and refactored