Awesome changes, no?
Added some magic.
Removed git modules and moved source directly in.