Finished Modularity Conversion