Refactoring File Structure