Rename target
Move headers from prviate to project setion