Re-Arranging the source and libraries