Restructured Project. Added common App