Moved each solution to its own package