Split files into concerns
Merge pull request #36 from SamLau95/split-files

Split files into concerns