Source is now split in three files

PR1