moving fs-specific stuff over to the fs project
moving certain annotation to the fs project