Merge #207 directory restructure into master