Adopt more clear file naming convention and fix dependencies