Attempted to fix issue when changing package folders
Added todos