Huge restructure and code clean up