Changed the file architecture