Move files to a more clean structure