Added files and cleaned up