Split features in different files

for easier management