cleaned up almost everything, more modular structure for all the angular stuff, lot of linting...