Better separation of files