Move code out of src dir