Removed .js in requires
Moved into node_module for better moduling