Moved answer to its own package
Fixed imports