Moving Interfaces to their appropriate files instead of storing in a single folder.