fix #1 split lib and application - remove includes