Infrastructure moved to solution folder