Fixed solution file with links and some code cleaning