added scope to each file, and simplified build process