restructure based on phoenix standard