rearranged modules code to be better organized, also added some editor customization for attributes pluing