cleaned up src/ tree