Refactored package structure / page / security