Changed directories structure for easier project development progress