Changed file-structure, enhanced grunt task