move files to appropiate src folder
rearrange to avoid adding -fpermissive in config.make