Organization Update 1.1

I pushed out an Update again that make the Code more reusable