Moved stuff so that it isn't in the src/ folder