more modularizing, specs.
renamed main file