Moved code around, removed unneccesary file