Cleaned up.
Moved into appropriate directory and renamed it.