Changed to NeoBundle. Separated Bundles to their own file.

Signed-off-by: Mika Tammi <mtammi@mtammi-serv.tm.intel.com>