Cleanup & License update & modularize