Implemented new directory structure