Clean up code and move configuration.xml.