Re-organized self variables and imports