Rearrangement of Files, Still Not Working Tests

As mentioned above; issues are still a thing. Contacted grutor/checking
out robolectric for our testing needs.