Move computation files to a separated directory
Move some setting code around