Added dub and moved files to subdirectory