Redone folder and solution setup