Refactoring two divide features into files + add association feature