REWORK

Whole source got a rework. New files were added others removed.