refactor directory structure, use absolute imports