Cleaned up the modules a bit; renamed data to appdata in the config