Files reorganize/cleanup