Refactored files (moved).
Fixed little error.
Automatic changes.