Remove xml config files
Cleaned bootstrap file
Move capability handling to a new manager class