Fixed file structure in VS