Moved stuff around and added tests folder