Moved files out of src/ and cleaned up unnecessary files