Cleaning up structure, adding python plugins