Restructure and simplify directory structure