Added gradle build and moved classes around