Moved files to speparate bin and lib directories