Updated project structure - separated common part and application specific part