Update gitignore
Move CS to its own directory
Move PS to its own directory