Changed project structure to a gradle one