fix additions and directory structure