Module directory restructure