Reorganized file structure
Relaxed build dependencies