Better Code in few files