Separated modules into new files