compilation fixes
ḿore files and functions shuffling