updated layout and subdir structure