Restructuring project directory