Directory structure update

Directory structure changed to make more simple root folder.