Revised structure

- Standalone support
- Dependency support