Removed unneeded files, moved some imports to Shared