rename nodes content provider
fix macros
reorganizer config structure
update dirs