Re-worked directory so it works better when it will be added through Bower