Restructured project and added main app