Changing names and structure

More suitable for an easy composer implementation :)