Added gradle wrapper
Moved a few things around