Move files to proper location & implementation CTCP