Consolidate/restructure codebase