Adding directory structure and classes