Re-Made new solution and re-organized files