added gradle stuff
moved stuff into gradle folders
formatting
Revert "formatting"

This reverts commit e6d9add97a9075b57ebe8b59fe7597e05ac17fa0.
formatting