Refactored files - Moved things