Fix import paths and include core app