Moved code to src/ instead of entities/