Cleaned up by moving to src/