Added builder lib, needs work on order of dependencies
Refactoring some js positions