Modified Library Files

Modified folder strucutre and _library files.