fixed import packages and dependencies, tweaked container and features.xml