Changed folder structure to help with debian packaging