Removed dependencies out of the main folder