Changed project structure to support deployment