Change of naming convention, adding important files