restructure directory tree, work on proposal