Rename file to match module name
Simplified a solution folder parsing