fixed packages and directories