Refactoed code + Added server + Added engine