fixing packages + making singletons